projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 683b4a8 68a40bb)
bitkeeper revision 1.1236.43.18 (42449899XrfAZaA5DQMd2TyF9OVOoQ)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 25 Mar 2005 23:02:49 +0000 (23:02 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 25 Mar 2005 23:02:49 +0000 (23:02 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/arch/x86/time.c patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/time.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.